Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🤖 Sync from open-cluster-management-io/config-policy-controller: #120 #470

Merged
merged 1 commit into from
Apr 10, 2023
Merged

🤖 Sync from open-cluster-management-io/config-policy-controller: #120 #470

merged 1 commit into from
Apr 10, 2023

Conversation

magic-mirror-bot[bot]
Copy link

@dhaiducek
Add refetch before updating status
a77a60a 
Especially when DeleteIfCreated is in use, if the status update fails,
the controller is no longer aware it created resources. A refetch
prevents the status update from failing due to conflicts.

Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
(cherry picked from commit f0e15dd)
@openshift-ci
Copy link

openshift-ci bot commented Apr 10, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: magic-mirror-bot[bot]
Once this PR has been reviewed and has the lgtm label, please assign dhaiducek for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sonarcloud
Copy link

sonarcloud bot commented Apr 10, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

92.3% 92.3% Coverage
0.0% 0.0% Duplication

@magic-mirror-bot magic-mirror-bot bot merged commit 4a6c70a into main Apr 10, 2023
@magic-mirror-bot magic-mirror-bot bot deleted the magic-mirror-main-1681133895226 branch April 10, 2023 14:43
@dhaiducek
Copy link
Contributor

/cherry-pick release-2.7

@openshift-cherrypick-robot
Copy link

@dhaiducek: #470 failed to apply on top of branch "release-2.7":

Applying: Add refetch before updating status
Using index info to reconstruct a base tree...
M	controllers/configurationpolicy_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/configurationpolicy_controller.go
CONFLICT (content): Merge conflict in controllers/configurationpolicy_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add refetch before updating status
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-2.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dhaiducek dhaiducek mentioned this pull request Jun 12, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
dco-signoff: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dhaiducek @openshift-cherrypick-robot